Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 7 Jul 2010 22:09:05 +0000 (22:09 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Wed, 7 Jul 2010 22:09:05 +0000 (22:09 +0000)

Trivial merge